Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 22 Aug 2010 22:56:05 +0000 (22:56 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 22 Aug 2010 22:56:05 +0000 (22:56 +0000)

Trivial merge